Merge branch '1.0.0'
Merge pull request #1 from JimmDiGrizli/master

Merge branch '1.0.0'