Changed version handling to fix pip install issues