Alfredo Palhares Merge pull request #5 from tst2005/master