Merge master into dev-1
Merge pull request #1 from asikk/dev-1

Dev 1