Merge branch 'develop'

diff --cc src/prolog/heap_print.rs
Simple merge

diff --cc src/prolog/machine/machine_state_impl.rs
index 940d0a926ed0f7160fea848ad5762053dbcc6e18,06b9298d86ab8ca610720b75852f06a7bbce7ab1..5748a43790587a633622f8b97e0dc2e983a5c4f1
--- 1/src/prolog/machine/machine_state_impl.rs
--- 2/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@@ -122,10 -137,10 +137,10 @@@ impl MachineState 
                                         -> Outputter
        where Fmt: HCValueFormatter, Outputter: HCValueOutputter
      {
 -        let printer = HCPrinter::from_heap_locs_as_seen(&self, fmt, output, var_dir);
 +        let printer = HCPrinter::from_heap_locs(&self, fmt, output, var_dir);
          printer.print(addr)
      }
-     
+ 
      pub(super)
      fn print_term<Fmt, Outputter>(&self, addr: Addr, fmt: Fmt, output: Outputter) -> Outputter
        where Fmt: HCValueFormatter, Outputter: HCValueOutputter