Version branch.version2 0.25 - December 2014

1. Couple of bug fixes. Things are running up to and including construction
of filenames including checking of data.