20140920 14:30 updates
resolved merge conflict