Commit 4

retargeted to NET4.0