Sub + Fling fixes
Merge pull request #1158 from Fuzzysqurl/motor

Sub + Fling fixes