merged release version 1.0.1