bugtracker id 0000039
Merge pull request #118 from sk-plehanovec/master

bugtracker id 0000039