Fix issue #80
Merge pull request #136 from trevorbernard/master

Fix issue #80