0.8.2 merge for #374 #379