Merge changes I00796d75,I1c20452e

* changes:
  Fixed windows support
  Added note on optimization