Update for 3.2.0
Merge pull request #25 from bhatfield/master

Update for 3.2.0