Issue 104, fixing schema