Bugfix for last bugfix (See #164)
Bump to 3.3.2
Merge pull request #166 from FrozenNode/3.3.2

Merge 3.3.2 into master