Update to Master code

Plus example of output file