Added global identity setting
Merge branch 'issue/6'