Merge pull request #30 from Porquepix/master

Merge pull request #67 from Ysnir/master
Finalisation v1

Signed-off-by: Yann <nayplatypusmith@live.fr>
Merge pull request #68 from Ysnir/master

Pull