Fixed it
Merge pull request #2 from I3G-Carlos/fix_some_stuff

Fixed it