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