Merge pull request #161 from floralvikings/master

Merge pull request #160 from floralvikings/develop
Fixed casing issue, closes #169
Merge pull request #170 from floralvikings/hotfix-0.5.1-alpha

Hotfix 0.5.1 alpha