Added better serialisation for multi-line comments.
Corrected bugs related to the serialisation of comments.
Merge origin/master