merge in changes from matteodem