Merge branch 'alexgreen' of https://github.com/sugarcubes/SugarCubes into alexgreen