Merge branch 'master' into 1.0
Merge pull request #19 from createloop/1.0

Merge branch 'master' into 1.0