improving message stores
Merge pull request #91 from abeykoon/improve_messageStores

improving message stores