Progress commit
Merge branch 'master' of github.com:hamloubser/hoodeye320