Fixed requirements
Merge branch 'dev'