Added some constant values
Merge commit '7b669e65932597775082b01ab036650bf065a815'