Changes for version 0.26