trying to make it right
Merge pull request #2 from gusaus/master

trying to make it right