Merge branch 'master' into kino-dome-master
Merge pull request #7 from fred-dev/kino-dome-master

Merge branch 'master' into kino-dome-master