Merging begamache/develop into begamache/master branch