merging to master, final check in
Managed to repack for a fully portable version