Merge pull request #168 from jhollingsworth/master