Bug fix. V1.1 for production
resolved merge conflict
Small enhancement