Add C# version
Merge branch 'kilj-master'

* kilj-master:
  Add C# version