Resolved #57