Merge pull request #6 from greynolds123/master

Merge pull request #5 from greynolds123/master
Merge pull request #7 from greynolds123/modules.git

Merge pull request #6 from greynolds123/master