resolved #72
resolved #71
resolved #60