Updated to v0.2.5

Improvements for Windows platforms