Upgrade 2.3.1 to 3.0.2
Merge pull request #1 from gedejong/master

Upgrade 2.3.1 to 3.0.2