Resolved #55