Started on Async and Fixed #27