update with latest commits from raphaelm