v2.15.25

Fixes issues #14 and #15,