Merge branch 'master' into indigo-devel
Merge pull request #36 from cra-ros-pkg/master

Merging REP-105 compliant changes from master to indigo-devel
Merge pull request #39 from cra-ros-pkg/indigo-devel

Indigo devel