Minor fixes to the last pull merge, restored lost license info, reformated source code.