partial commit
Merge branch 'master' of github.com:brando90/UAP