-rework

Signed-off-by: Dmitry Ponyatov <dponyatov@gmail.com>
Merge branch 'master' of github.com:ponyatov/cross
.