Fix #18, bugs fixed!!
gracefully waiting