from DSC
Merge pull request #1 from scdong/master

from DSC