merge exane-master branch