Fix for #14.
Merge pull request #15 from vjoel/fix-issue-14

Fix for #14.