Merge pull request #154 from rsalinas/master