with smolt
Merge branch 'master' of github.com:circass/pisi-work