Playing with data formats class
Applying some C++ style. Addition of more features