Dynamic wait time version
Removed logging test
Fix log messages
Merge pull request #1 from amochtar/master

Dynamic wait time version