code convention
Merge branch 'master' of https://github.com/gabrielhomsi/octo-hipster
many=FALSE mode working
Merge remote-tracking branch 'origin/master'