Merge pull request #1 from butschster/dev

Compare
Merge pull request #238 from KodiCMS/dev

Merge pull request #1 from butschster/dev