Hotfix.
Merge pull request #38 from wiredearp/master

Hotfix
Merge branch 'master' into 0.0.4-ts