Improve version numbering