just in progress for release 1.0.2