Fix #73
Merge pull request #81 from ninjalulz/patch-1

Fix #80
Merge pull request #17 from Znote/master

fix