Merge pull request #365 from micheldumontier/release3

Release3