Issue #34 closed