add one condition for checking is array
difine one var in public
Merge fixed
Merge branch 'amarpanday-master'