Issue #34 and issue #35