Merge pull request #1 from oratorio/master

Pull this from Frankie