just changed a multiline if-statement to a single-line one
Merge branch 'master' of github.com:dopm/admins-friend