Fixed a bug which happens when separator is last element of string
Merge remote-tracking branch 'origin/master'