Version 2.3.1
Bug fixes.
Merge pull request #1 from rstueven/2.3.2b

2.3.2b