Merge branch 'develop'
lib requirements
Merge branch 'master' into develop