Closes #222