issue#6 Coding fixed errors by david, jonny