I can't get a break with this one...
Merge pull request #86 from funnylookinhat/develop

Hotfix v1.0.2a