Adds getBufferLength().
Merge branch 'klw0-master'