Merge pull request #63 from am11/master

Release: Version 2.3.3
2012 v3.8
Nightly 2.3.4
Release: v2.3.4.1.