Merge pull request #122 from dannybutler/master

Whole load of additions and bug fixes