ChristopherRogers1991 Merge pull request #16 from burnsfisher/master