Issue #131 closed