Added contributor.
Merge remote-tracking branch 'forkfrom/master'
Throw exception on parse error.