Changes

Lionel,

  These are the changes since you forked.  It is a good idea to accept these changes so your fork is current.  I have merged your changes so they are in here (hopefully it will merge without issue).  I have ALSO made changes on top of your changes to address some issues (I will send you an email attempting to explain what happened).

  Obviously, I will work with you to try and make the translation process as painless as possible.  Please be patient while we figure out all the potential complications.