Globalisation changes
Fixes #38 and #39
Contact Implementation fixes
Merge pull request #50 from fnva/master

Fixes #38 and #39