Changed version
merging conflicts
Modified readme