Merge pull request #113 from yupe/master

UPD: merge with yupe/master
UPD: small optimization of "magic" getter for user->id
Merge pull request #1057 from angel-kulikov/master

UPD: small optimization of "magic" getter for user->id