Merge pull request #100 from ziggimon/ros6-update

Ros6 update
Doing it the right way.