Updated to work with alexisvincent/ubuntu