bug fixed version 1.0 for production