resolved #9, resolved #10