Exari6.2.2

Please pull these changes. I will send pull request more regularly in the future.
Hi Marco, Thanks for explaining. My mistake here. Merging your code.