Fix typos
minor #241 Fix typos (bicpi)

This PR was merged into the 2.2 branch.

Discussion
----------

Fix typos

Commits
-------

0a87262 Fix typos
Merge branch '2.2'

* 2.2:
  Fix typos