Ros industrial

Merging changes described in #17 into master.