Updated a last changes made by me and shiio
Merge pull request #5 from SrPatinhas/patch-1

Updated a last changes made by me and shiio