[#7] PR comments solved