Commit 7 July
Merged changes from original fork into my project
- Added missing files and DLLs
Second attempt to merge
Commiting merge fix
Merge remote-tracking branch 'upstream/master'