fixed pull #1

Fix to use async mode & comment fix