ups closes issue #18
Merge branch 'smbuild2' of https://github.com/msudenver/rowdytheroadrunner into smbuild2