Fix for issue #32
Merge pull request #33 from tamsanh/issue-32

Fix for issue #32