Added to dictionary
Merge branch 'parser' into groupWork