Pull request for 9-

Fixes #9-.