Closes #231