Interim commit.

Issue #192