Added definition of scalars
Added a comment
Modified Makefiles