uon merge conflict fixes
Merge pull request #45 from drjosephbaxter/master

uon merge master