Issue 65

I think this covers #65.