Upgrade to version 2.6.0 and improve windows support