Update Readme to add documentation
update Readme
Add new makefile functionality to merge files
Merge branch 1.0.0 into master