Close GH-8: somewhat related to #3. Fixes #3