Merge pull request #1 from fernandezgom/master

Pull from fernandezgom 22/04/2013