Add support for 'RETURN'
Add support for comments