Merge pull request #90 from ninjalulz/master

Fix #88
Merge pull request #24 from Znote/master

Merge pull request #90 from ninjalulz/master