little change for compiling
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	config/style.sty