Version update. (updates #2)
Conflict edit. POM update. (#2)
Merge branch 'update-version' into develop