Closes #285