Merge pull request #1 from dktran2007/master

m1