Merge pull request #21 from stevecoward/master

Lots of updates, see below