Closes #87, which seems to work now