Updated to add Ubuntu support