Merge pull request #122 from mooffie/custom_display_name_handler

Custom display_name handler.
Pull #121 applied manually - custom tags may be hidden