Merge pull request #1 from catkin/master

Pulling in changes from catkin