Merge pull request #1 from elbuo8/master

Updating
Fixes and a couple of suggestions
Merge pull request #2 from jpadilla/master

Fixes and a couple of suggestions