Introduced getConst in Helper to smoothen out code-amount
Merge remote-tracking branch 'origin/master'