Merge pull request #4 from adrianfish/master

Rebase of master