Merge pull request #1 from yyttr3/master

Pull1
Merge pull request #3 from blakeeasley/master

Merge pull request #1 from yyttr3/master