Closes #206