merge with geni_api branch