Merged files from  june 06 (main branch)