new updates
Merge branch 'master' of https://github.com/rofflebuster/psychic-octo-hipster
added flags