Changed from en-us to en-GB. Closes #001
Merge branch 'setup'