Merge branch 'dev'
removed docs from master
Merge branch 'master' into dev