Merge pull request #1 from jaxxa/PersonalShields

Pull Personal Shield changes into Base