Issue/812

Closes #812