Hopefully closes #93