Merge pull request #165 from avelino/master

CubeJoin, layout refactory, translate