Rebase and merge changes of PR#131
Rebase and merge changes of PR#131