Initial catkinization
Merge pull request #1 from miguelsdc/devel

Catkinization