Closes #188