closes #201
Merge branch 'iss201'