Merged pull request from sean-kang.