7a8bcb9 Merge pull request #4 from robertdebock/master

4 files Merged by Benjamin Bryan 6 years ago, Committed by GitHub 6 years ago,
    Merge pull request #4 from robertdebock/master
    
    Merge from upstream
        
file modified
+4 -2
file modified
+8 -0
file modified
+8 -1
file modified
+1 -12