Added possibility to show non implemented elements
Merge remote-tracking branch 'origin/master'