Merge pull request #1 from alinpopa/master

Try to fix the async support
Code cleanup.