[#5] PR comments solved