Con makefile
Con readme
Merge branch 'release/1.0.0' into develop