Moved constants to Config file
Merge origin/master