Add simple Makefile
Merge branch 'release/1.0.0'
Merge remote-tracking branch 'upstream/master'