merging from master dec 05