Fix issue #14
Merge pull request #15 from wasamasa/bugfix-14

Fix issue #14