Merging version update
Ok, really updated version this time