Issue 41 improvements in uos class

Implemented suggestions made at #41