resolved #14, resolved #15