try new branche
Merge branch 'stable' of github.com:mjirik/lisa
Merge branch 'master' of github.com:mjirik/lisa