First pull request ever

Review and let me know if this fits your needs