Create readme
Merge branch 'master' into testing
added some TODO messages