v2.0.8, #14, code refactoring, optimizations, bugfix