tiny fix
Several upgrades
Merge pull request #11 from dericofilho/master

upgrade