Merge pull request #306 from infrastation/develop

another supplement of constants