Makefile adjusted, needs to be tested.