Clean up
Merge http://github.com/AlAdler/FoneApiCSharpWrapper