Bug fixed version 1.1 for production