Kjc 1.2

Merge Changes to Master