#94, #95, new version: 1.0.1