added async, pipeline, some small bugfixes.
Merge remote-tracking branch 'origin/master'