Merge branch 'integration' of github.com:sugarcubes/SugarCubes