merged patch fixed version 1.0.1