fix readme
fixed unit tests, removed string from framework
Merge branch 'master' into develop