Updated, not sure if I updated everything

I'm lazy D:
Merge pull request #42 from pazzoeo/patch-1

Updated, not sure if I updated everything