New Version 1.0.1 (reverted from commit fada76302beb97418f485f8c5f4c118f84ee12cf)