Fix bug #57
99 files changed