Improvement and modification

Transition from VS2012 to Xamarin Studio