Resolved #94