Merge pull request #45 from gregorybesson/develop

1.2.1 Intl phase 2