Dev loic

merge dev-loic into master