Alex shoe edit/add.
Merge branch 'master' of https://github.com/rommen/octagon