#383 Commit with changes by comments @drdla