my part in this nonsense
Merge pull request #7 from CCliff/master

my part in this nonsense