Merge pull request #93 from nromanen/master

Merge
fix after merge
unit tests
pagination in process..
pagination in process...
Merge pull request #94 from nromanen/yurembo

Yurembo -> master
merge