some changes done by gsalazar
Merge pull request #1 from gus-salazar/master

testing how to pulll