fixed requirements [ci skip]
Merge branch 'master' into 0.2