New version

Brand new version for windows with improved output generation