Merge pull request #7 from msimonin/master

merging 2.1.1