fixed reader, fixed two annotations
Merge branch 'master' of https://github.com/ajutscaria/CS224U