fixes #388
Merge pull request #401 from pastephens/dev-testing-1.7

fixes #388