Merge pull request #166 from avelino/master

Fixes cube, scheduler and queue