Final work from Jon
Merge pull request #1 from ZacMcClain/master

Final work from Jon