Commented out rospy shutdown.
Merge branch 'dev'