Merge branch 'master' into development
Updated readme
Merge branch 'development'