Make reset async
Set version
Merge with master