c3a999 merge pr/5 and fix version/changelog conflicts

Merged and Committed by Brian Stinson 2 years ago
    merge pr/5 and fix version/changelog conflicts
    
        
file modified
+2 -7
file modified
+3 -3