Updated for Linux/Ros Compatibility