.
Merge branch 'master' into dev
Merge branch 'master' into dev
.
Merge pull request #137 from michalikm/dev

Dev