New data structure
Merge branch 'master' of github.com:cistov/oy