added comment parsing in latest version