Fixed #52 and Vault repo