Merge branch 'development'
upgrading version to 5.1.1
Merge branch 'master' into development