Merge pull request #1 from sonicpunk/First-Branch

Pull Request - tested
Merging my changes