Close Issue #57

Close Issue #57