Issue #9

Fixes issue #9
Merge pull request #11 from skpacman/dev

Issue #9