Working on issue #1.
Merge branch 'master' of https://github.com/SeanHeuer/Sean-the-Troubleshooter

Working on issue #1.