Merge pull request #120 from sjorek/fix-code-segmentation

Fix and enhance code segmentation for folded and embedded block-comments
bumping version to 0.6.1
fixing package.json -- oops
Merge branch 'nevir'