Added async option (ticket #367)