Merge pull request #1 from emrickgarrett/master

Test
Merge pull request #3 from brobinson09/master

Merge pull request #1 from emrickgarrett/master