Merge pull request #2 from Edgardecay/small_changes

update
Merge pull request #3 from Edgardecay/master

Merge pull request #2 from Edgardecay/small_changes