Fix for issue #14
Merge pull request #16 from hbf/fix-for-issue-14-2

Fix for issue #14