Merge pull request #1 from stubbornella/master

Pull