New version
New version
Merge branch 'develop'
Fixed merge conflicts
Updated develop requirements