Added basic comment folding
Added Comment folding. Merged Changes