hotfix
Merge pull request #16 from teleportd/hotfix

Please review: Hotfix