Updated to work with latest git repository and to package