Fix issue #16
Merge pull request #41 from kchien/fix_issue_16

Fix issue #16