limit the number of buffers displayed. fixes #221.
just in case...defense coding.
Merge remote-tracking branch 'upstream/master'

Merging bling's upstream into my fork