#34
Merge pull request #36 from JimmyThompson/master

Fixes as per #34 and #35