Merge pull request #2 from sbirkov/master

pull3
old
Merge pull request #2 from telebid-class/master

pull4_merge