Fixed bug where if messages were < 20 only the number of messages to start would show on the screen
Merge branch 'release/1.3.1'