Merge pull request #6 from DanielGibbsNZ/master

Various improvments.