1.1.5-6
Fixes after refactoring
Merge pull request #422 from anatoliychakkaev/master

Final tuning for cs-compound