Merged WindPower's changes with original repo.
Merged wind_changes branch in to master.