Merged & closed #72