Add default functionality to 1-1
Merge branch 'master' of ../stage