Initial solution
Merge branch 'dev' of https://github.com/kuzminyv/tsr into dev