Issue #176
Merge pull request #62 from neilbowers/master

Issue #176