fixed bug if expand options is specified as array
Merge branch 'develop'