Issue482

Created by: fred-wang

I have address the review comments.

(Note: one of the advantage of a pull request is that it directly shows the diff between the two branches)