Preparation for 1.2 release
Update #283 - Add async support so we don't crash