Some Improvements un GeoPlatformWizard
MERGE with MASTER