Merge pull request #17 from msimonin/master

merging 2.1.1