Merge with Donggu modifications

2012-01-10, laurent