Lets merge this!

This is one of the first times I've tried a "pull request" on Git... hope I'm doing it right :)