Fixed settings version
Improved makefile