Feature/catkinize