Xamarin adjustments to the package from @stefandevo from PR #34