Multiline comments added
Add escaping to deal special characters
Merge branch 'master' of https://github.com/ptal/nominal-workbench