resolve issue with multi-line comments.  This resolves #7 and resolves #2.