Finished wait list
Fixed #12