Optimization
corrections
corrections
Add wait step + some corrections + indent
Merge pull request #12 from gwleclerc/master

Working on windows