* Add return sentence.

* Add test.

* Address comment and add more tests.

* Rebase and fix conflict.

* Update.