Minor bugfixes
Merge pull request #8 from skywarka/C#/XAML

Minor bugfixes