Merge pull request #49 from jboone/master

Dubious pull request containing...