Resolved #73