Simplify freezing with cx_freeze.
Merge remote-tracking branch 'origin'