Merge update from original author

Merge update from original author.