Merge pull request #9 from steven-murray/master

A few updates