expanded the api of the SourceParser
Merge branch 'origin/master'