Fixed Vault Dependency and other small issues
Merge remote-tracking branch 'origin/master'