#396 Added author comments