Merge pull request #1 from Anubisss/master

Pull from master