Jacob Cook Merge pull request #11 from jcarbaugh/master