Pulled in @marcb777's fixes
Rename the Solution to include the Xamarin prefix
WIP