Resolved #25