Fixed #27
Merge pull request #28 from ChrisGrant/master

Fixed #27