Merge pull request #1 from Tux2/master

Pull from upstream