Merge pull request #14 from ermekhvtr/master

Пулс 14122014
Поправочки
Merge pull request #6 from protectedfor/master

rse