Closes #223