bug fix v1.1 for production
resolved merge conflicts
completed