Merge pull request #123 from patriot1burke/master

release prep
Merge pull request #124 from patriot1burke/master

pom fix
version bump to SNAPSHOT
Merge remote-tracking branch 'upstream/master'