Fixed #34
Fixed #35
Fixed empty Message Store notice
Merge pull request #36 from AntonShevchuk/master

Fixed 3 issues