Cleaned makefiles
Makefile improvements
Merge branch 'unstable' into 0.2.8