upcube more fixes
Merge branch 'master' of https://github.com/tbohlen/fibers