Merge pull request #5 from sylvainmerlin/develop

Merge tag '0.1.0-vagrant-test' into develop
Merge pull request #6 from sylvainmerlin/master

Merge pull request #5 from sylvainmerlin/develop