Fixed bug with spaces in message names
Complete parser