0.16

Can someone peer review this please. It should (hopefully) fix #310