Merge pull request #19 from viannou/dev

Merge pull request #18 from viannou/master
Merge pull request #20 from viannou/master

Merge pull request #19 from viannou/dev