Update to requirements
Merge branch 'my'