Error fixing
Merge pull request #3 from d3cod3/master

Error fixing