adding mesos
Merge remote-tracking branch 'origin/addmesos'