Added back missing makefile from merge. Changed version to 0.5.1