Issue/922

Closes #922