Merge pull request #167 from jscott0/master