First pull request

Hopefully I'm doing this right :)