Trim whitespace
Improve stop + jump to end
Merge branch 'dev'
Build 0.7.4