Merge pull request #2 from telebid-class/master

pull4_merge
Merge pull request #3 from sbirkov/master

Merge pull request #2 from telebid-class/master