v1.1.0.1 - removed some unneccessary code