Initial commit
Merge branch 'master' into TESTBRANCH

Conflicts:
	Makefile