better merge
better pom version
Merge pull request #775 from dburdick/develop

Develop