updated fork with changes recommended to work with 14.04