Merge pull request #36 from romankh/master

2 bug fixes and subslot assignment in universal ctrl channel demapper