Add forced encryption support
Improve stopping behaviour
Add save path history
Merge remote-tracking branch 'remotes/hexf/master'