Made version grapping a bit better