changed delay to wait, close #70