Merge branch '#369'
Merge branch 'master' into #369