Closes #459 (closed)
Rigth now it is just copy of Anton's solution form Github to start disscussion...