Merge pull request #6 from ljo/master

Upgrading to release 2.1 and 2.2.