Merge pull request #7 from philwareham/master

More updates
Merge pull request #8 from philwareham/master

Last bits