Resolved #50