Merged agains latest version..