Refactoring + fixes + features
Merge branch 'rewrite' of github.com:Detegr/tapi2p into rewrite