test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile.in
	include/Header
LM
LM2
LM3
conflict