Bug fix for new feature
Fix for latest version