Merge branch 'master' into development
Fix bug in install"
Merge branch 'development'