Merge pull request #5 from bguerin/master

A fix, an enhancement, more documentation and more tests
Fix bad copy/paste