[#8] PR comments solved