merged latest master from Nicolas

@nicolaskruchten : Thank you!