merge laertemarcal-master into pr33