Added comments parsing ability