Generic improvements, update 1.0.1
Fix merge