integrate VKJ changes
Merge branch 'vkj'

Conflicts:
	main.pdf