Check NAMESPACE & add clean generic
Bump version to 4.0.0