Adjust for OSGi environment.
Bump version to 0.2.3.1
Merge branch 'develop'