fix comments and cnage promise to defered
fix comments
merge
Merge pull request #35 from drzoom3/master

fix comments and cnage promise to defered