Added support for '+' as escaping of whitespace, improved comments.