Twiktor refactored

Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
Merge branch 'master' of https://github.com/SerCeMan/twiktor