Formatting
Merge branch 'master' of github.com:regebro/spiny