Some fixes, wind force / direction controls
Merge remote-tracking branch 'remotes/GitHub/master'