Merge pull request #307 from jcd-as/dev

Emitters drag fix.