Merge mlhamel's repository