Adding in new message types
Merge branch 'master' of github.com:wyattearp/iDectectProject