Merge pull request #402 from gregquat/2.3

Updating 2.3 with #399
Merging #401