Merge pull request #1 from bkinney91/master

Pull Bryce's code