Fixes Issue #6
Merge remote-tracking branch 'upstream/master' into issue-6
Merge pull request #7 from evert/issue-6

Fix for Issue #6