Ported changes from 0.3.1 and bumped version to 0.3.2-SVN