Merge pull request #27 from poupotte/master

Code cleaning
Merge pull request #28 from poupotte/master

Correct test
0.12.0