FInal fiiiiiiiix

:D:D:D
Merge pull request #9 from JeremyGee/master

Final fix :D