Various minor updates and refinements
Merge pull request #11 from cameronleake/master

Various minor updates and refinements