[#29] PR remarks added