Addition to previous commit.

Related to issue #16.