merging with geni-api branch