Merge pull request #1 from cambre/master

Changes look good
Merge pull request #2 from cambre/1.0

Merge pull request #1 from cambre/master