Merge pull request #16 from cbs68/master

Merge pull request #5 from GALLAY/master
Merge pull request #6 from GALLAY/master

Merge pull request #16 from cbs68/master