Makefile
update and bump version to 2.0