v1.2 - Fixed class/namespace conflict