Added missing return
Merge branch 'colour_picker' of https://github.com/thetestpeople/Geist into colour_picker