Fixed false CharTypedInBuf event invokation
Merge branch 'refactoring'