exdi now accept arrays
Merge branch 'develop'