Closes #215