Merge pull request #20 from viannou/master

Merge pull request #19 from viannou/dev
auto
auto
auto
auto
auto
auto
auto
Merge pull request #21 from viannou/dev

Dev