Closes #205