Merge branch 'master' into development
revert link in readme
Merge branch 'development'