9/10 commit
Merge branch 'master' of https://github.com/pgadangi/strategy