Performed some refactoring of the data container classes and partially
implemented potential formula classes.
Merge branch 'master' of https://github.com/jansenk/datagen
Made some changes to merge without introducing additional errors.