Ugly hack removed
Makefile improved