extra merging
Merge pull request #1 from hpimentel/master

trial