Restructured waitFor commands
Merge pull request #72 from joaquincasares/newWaitFors

Restructured waitFor commands