Merge pull request #1 from Demenza/master

Pull me