Close GH-4: PR for issue #1 and #3.