Version 3.3

After working on version 3.2.6 for a while, I ended up renaming it as
3.3
Merge pull request #68 from duechiacchiere/master

Version 3.3