merge with my po4a branch & update both pot's