updated after teachers comments
Merge pull request #5 from jlsa/Fix

updated after teachers comments