Merge pull request #91 from jrrmerlin/master

Issue #86