More globalisation
Merge pull request #114 from chillu/pulls/globalisation-again

More globalisation