Merge origin/master
Added Constant class
Merge origin/master