Merge pull request #6 from sylvainmerlin/master

Merge pull request #5 from sylvainmerlin/develop
[UPDATE] - Added a Berksfile just to give it a try
Merge pull request #7 from sylvainmerlin/develop

Ok let's do this