preparations for MSK-240
Merge branch 'master' of github.com:anotheria/moskito