yupe/yupe — pull request #894 by angel-kulikov (2013-04-27 18:26:16+00:00)
Title: UPD: small fixes

UPD: merge with yupe/master