John Marinelli pull request

Hey there, hope to hear from you soon!