Merge pull request #1 from marcosadp/master

A few changes