Merge pull request #4 from mbarker84/my-changes

Merge pull request #3 from mbarker84/master
Merge pull request #5 from mbarker84/master

Merge pull request #4 from mbarker84/my-changes