Merge pull request #35 from kingtaurus/master

Proposed changes to fix issue #32