refactored IncrementType to support both integers and floats

fixes #526