Merge pull request #74 from msimonin/master

merging 2.1.1