Improved waits
Merge pull request #91 from Eriten/waitImprovement

Explicit Waits