Joshua Chen

@leo-buneev Thanks for the quick review on the previous issues, this plugin is working great! Sorry for overlooking this last time.

@leo-buneev Would it be possible to get these changes merged in soon?