Update to 2.3.x
Merge pull request #4 from wsargent/2.3.x

Update to 2.3.x