Merge pull request #3 from yyttr3/master

pull7
Merge pull request #6 from blakeeasley/master

Merge pull request #3 from yyttr3/master