Fixed mixed identation styles
Merge branch 'master' of github.com:do9xe/gluon