MessengerFix
Merge branch 'develop' of https://github.com/Fussel/distributed into develop