Better Makefile
Merge branch 'master' into enhanced_facade_properties