Issue/808

Closes #808