Fix Warning: array_unshift() expects parameter 1 to be array, null given error
Merge remote-tracking branch 'origin/master'