artizirk Merge pull request #8 from alex-courtis/add-way-displays