Merge branch 'hotfix-2.0.1'
Merge pull request #1 from blockmurder/master

Merge branch 'hotfix-2.0.1'