Merge branch 'master' of https://github.com/jdereg/n-cube
Merge branch 'master' of https://github.com/kpartlow/n-cube