Closes #197