Pull request from Wenying Liu (wl1207)

This is the pull request from Wenying Liu, Net ID wl1207.