Build #58:   Refactoring, corrections, code cleanup on branch v0.2 almost 9 years ago