Merge pull request #1 from abathingchris/develop

changes for abathingchris