External annotation support added

Conflicts:
	main.js
	package.json