Fix #78
Merge pull request #18 from Znote/master

Fix #78