fixed issue #5

Partial fix for issue #5
Merge pull request #6 from 007au/master

fixed issue #5