Resolved #47