merge windows changes and arduino changes