merge Issue #54