- Fix for #383

Signed-off-by: Joker-SMF <makerzzz.zzzz@gmail.com>
Merge pull request #720 from Joker-SMF/release-2.1

- Fix for #383