Closes #198