add tests and update readme
Merge branch 'master' into update_readme
updated readme