chdinh/master to LorenzE/master

Update LorenzE's master branch with newest version