Merge branch 'master' into nightly
Minor formatting changes

+ addition of some constants to be used in future
Merge branch 'nightly'