Closes #168