CHANGE: modified and corerected make files
Merge branch 'dev'