slipster216 Merge pull request #2 from James231/master