Merge pull request #1 from ros/master

update from ros
Merge pull request #2 from ipa-fmw/master

Merge pull request #1 from ros/master