Improving versioning code for better maintenance
Documentation updates