Merge pull request #171 from jhaynie/master

minor commits