First merge of actual code for py-exe-builder