More verbose, cleaner processing
Merge pull request #8 from daitken/uofm

More verbose, cleaner processing