updated parser
changed datasource links
Merge remote-tracking branch 'origin/master'