Merge pull request #5 from c410echo/master

Merge from master
Merge pull request #20 from CCarrCIS410/master

Merge from Master
Merge pull request #22 from Hmturner/master

Merge to Dev
Merge pull request #21 from c410echo/dev

Merge to master
Merge pull request #5 from c410echo/master

Merged from Master