Merge pull request #94 from dduponchel/master

Release v2.1.1