Closes #221