added async methods and test
resolved conflicts