Merge pull request #3 from AAROC/dev

merging from AAROC/dev