Resolved #54