Merge branch 'pr/32'
Merge branch 'master' into translations