Changes here and there
Merge pull request #1 from gregoriorobles/master

Changes here and there