Modded to version 1.0
Added another version
Added another branch/chaged version
fixed conflict