Fixed some errors
Merge branch 'master' of github.com:ROS-PSE/arni