Issue #95
Merge pull request #96 from swampie/master

Issue #95