whitespace fix.
Added a function to compute array length.
Merge commit '22f32d0bfe97ecc39c8574b93fa905c68dade9ba'