[max_wait] cleaned up max_wait
Merge pull request #61 from portertech/max_wait

[max_wait] cleaned up max_wait