Merge pull request #29 from abubeck/feature/catkinize

Feature/catkinize