Fixes #62
Merge pull request #63 from thaiat/fix-bug-62

Fixes #62