removed dubble messageManager
Merge pull request #7 from tibistibi/master

more fixes