Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Merge branch 'master' of https://github.com/jeremynetkin/test.git