#390 Changes by comments from @Chrico, @drdla, @mturalenka