Formatting
Merge branch 'develop' of github.com:stechstudio/Piton into develop