added constants
Merge branch 'constants' into develop