Merge pull request #3 from AAROC/dev

merging from AAROC/dev
Merge pull request #129 from brucellino/master

Merge pull request #3 from AAROC/dev