small update containing latest commits