Merged with a recovered updated source. Several small changes. Skeleton class for ConfigReader. Closes #10