Merge & add javascript source code listing support