catkin
Merge pull request #8 from pavel-hajek/master

catkin