Merge pull request #937 from chandrasekharv/dev-branch

Array index out of bound exception handled for url split query
Added missing file.
Merge pull request #939 from anilgooru/dev-branch

Added missing file.