[#3] PR comments solved.