new version
Merge pull request #21 from PassioEtDesiderium/master

new version
Minor improvements, documentation
Merge conflict