Locale made optional, set it default as english
Merge branch 'version-2.0'