Issue 69 fixed