Bugfixes for 2.5.1, e.g. Issue #136
BNote Patch Release 2.5.1