get rid of NumberOfIntervals

related to issue #21