Changed makefiles and resolved warnings
Merge branch 'c-code'