merged changes from CarpeNoctem's fork
updated exe