Veniamin Ilmer Added change from tafia - #17