tidy things up
Merge branch 'master' of github.com:jdhenke/uap