Fixed the problem
Merge pull request #1 from JoahG/master

I think I fixed the problem :)