Improved code to avoid errors
Version bump