version bump to SNAPSHOT
Merge remote-tracking branch 'upstream/master'
Merge pull request #125 from patriot1burke/master

version back to SNAPSHOT