fixed encoding + special chars in references
resolved merge conflict