wip
Merge branch 'wip' of https://github.com/simplificator/trajectory into wip
wip