Merge pull request #62 from luisalvarado/master