more work
Merge branch 'demo' of github.com:oleks/onlineta into demo