updates for test
Merge pull request #166 from tcarver/master

updates for test