Fix PR/16.
Merge pull request #2 from Hywan/pr/16_fixed

Fix PR/16