Better parsing of the _source parameter.
Merge pull request #64 from CGenie/merge_with_official

Better parsing of the _source parameter.