Hotfixes
Merge pull request #68 from wiredearp/master

Hotfixes