Updated version and comments