Merge latest changes from @stanzheng.

Updating my fork.