Merge pull request #15 from ekmoreau/master

Merge pull request #3 from sc1885/master
Merge pull request #4 from sc1885/master

Merge pull request #15 from ekmoreau/master