Merge pull request #1 from rbreu/master

Small changes