Final update for 2.1.0
Merge pull request #107 from sdeleuze/master

Final update for 2.1.0