Merge pull request #2175 from dbhurley/master

Updated to check for array