wardw Merge branch 'baszalmstra-master'