Updated to v5.0
Fixed README conflict