Testing the new feature and a minor fix.