Bug fix/versioning