Adds mail function to the lib
Adds constants
Merge branch 'master' into francis-branch