Fixing bug 70
11 files changed