Speed-up first analysis
Fix version numbering