bugtracker id 0000035
Merge pull request #120 from sk-plehanovec/master

bugtracker id 0000035