Fix #15
First stab at #13