merge changes from previous PR
Closes #740
1 file changed