Fixed requirements
Merge branch 'develop'