PR changes.

Changes to #84