Feature/{#62 apply feedback}