Merge fix for issue #6.

Fix #6.