Update to 2.3.0
Merge pull request #1 from chatellier/master

Update to 2.3.0