jacket-40
Added loc script
Fixed semantics to collect macro names
master
Merge branch 'jacket-40'

Conflicts:
	README.md