Hotfixes
Merge pull request #68 from wiredearp/master

Hotfixes
Merge branch 'master' into 0.0.4-ts
Pøm pøm