Issue #34 closed, merged into DEVELOPMENT