Improved version field (#181,  Fixed #185)