Merge pull request #2 from adamjakab/dev-1

OK
Merge branch 'master' into dev-1