updated.
Merge https://github.com/tongc/temp