Setup added requirements
Testing 1
Merge branch 'master' into testing