Fixed variable names in generate netlist function
Merge remote-tracking branch 'upstream/master'