Clean code
Add cube mapping
Merge remote-tracking branch 'origin/master'
Finish with A; Add query and render condition