Rewrote flush commands with shellquote per suggestion of aellert
Merge remote-tracking branch 'origin/master'