mods
Merge pull request #2 from opaucara/testing

mods