community submission. Closes #842