Version 2.1 changes.
Merge pull request #3 from miceno/2.1

Version 2.1 changes.