Merge suggestions

This PR is to close #163 task.