Merge pull request #717 from ovatsus/master

Improve C# compatibility
Oops