Resolved #20