Resolved #58