Upgrade to 3.3.0
Merge pull request #32 from mwanji/master

Upgrade to 3.3.0