Merge pull request #128 from AAROC/dev

Merging into master tree from dev.
Merge pull request #129 from brucellino/master

Merge pull request #3 from AAROC/dev
Added boundary monitor role
Merge pull request #4 from AAROC/master

merging from AAROC/master