added current users directive
Merge branch 'newDirective'
fixing conflicts