starting work in dev
Merge pull request #55 from AAROC/master

starting work in dev