Bumped version
Merge branch '4.0'
Namespaced the helper functions and improved trait detection
Merge branch '4.0'