Add #one-two direction code
Merge branch 'master' of ../stage