Merge pull request #11 from mikestok/master

Fixes issue #9