added support for first line comments and tests