Merge pull request #8 from drjosephbaxter/UoNChanges

UoN changes