Fixes #64
Merge pull request #65 from thaiat/fix-bug-64

Fixes #64