Added author and comments