Make short options work correctly
Fix usage example