Fixed environment variable handling.
Version bump to 3.2.1.
Merge branch 'develop'