Merge pull request #6 from Eddy10/master

Pull Request
Added Support for 2.X+