Merge all other contributions

New feature
Fix Windows bugs