fix merge issues when merged in from master branch
Merge pull request #162 from coryb/testing

fix merge issues when merged in from master branch