merge matlab version and win version
commit win and matlab version all files