Code

Integrate fix from Jon Cruz regarding localization on OS X