Added basic comment parsing