Per issue #11. Merge issue.