update readme and makefile
Merge branch 'feature-readme_makefile_etc'