Merge branch 'master' of https://github.com/jackstah/SugarCubes into jackstah-master