Merge pull request #4 from hsmelens/dizains

Dizains
Merge origin/dizains into tests2
5