Made some changes
Merge pull request #1 from bbaugher/issue1

Made some changes