Added support to simple comments

Please merge with this commit. Thanks.