One more, biaatch! Closes #137