Fixed Aero2 bug under windows 7.

And organized some code.
Merge pull request #3 from diantahoc/master

Fixed Aero2 bug under windows 7.