New architecture
Merge branch 'master' of https://github.com/chrissnell/Lightcube