Merge branch 'master' into allen
updating Mainac
Merge branch 'master' into allen
Merge branch 'master' into allen
Merge branch 'master' into allen
adding voice support
Merge branch 'allen'