Merge pull request #14 from francois-keith/master

Handle catkin packages.
Correct the stack test.