Fixed number_of_messages
Merge branch 'master' into kingman