Merge pull request #2 from humberry/master

Merge pull request #19 from tjferry14/master