Merge from upstream/master, fix pom to exclude vault
Merge pull request #1 from TheRussian45/master

Merge from upstream/master, fix pom to exclude vault