Merge pull request #1 from ros/master

rebasing