Merge branch 'master' into 1.1
Merge pull request #24 from createloop/1.1

Merge branch 'master' into 1.1