Merge pull request #83 from tmortagne/master

Remove useless hack
Merge pull request #84 from tmortagne/master

Fix example
Add unit test