bug fix in master
resolved merge conflicts with master