Fix for array vs. object. Added demo files.