Added ApiEndpoint configuration parameter
resolving readme conflicts
updates